From: Colin Walters <walters@verbum.org>
Date: Fri, 1 Dec 2023 20:05:40 +0000 (-0500)
Subject: sysroot: Expose deployment runner outside of selinux
X-Git-Tag: archive/raspbian/2023.8-1+rpi1^2~9^2^2~4^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=aa635bf559a5f847d061648ecb9486263195f8f8;p=ostree.git

sysroot: Expose deployment runner outside of selinux

We will use it in e.g. s390x zipl backend.
---

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 7648f299..8f93d4ab 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -3151,7 +3151,6 @@ get_var_dfd (OstreeSysroot *self, int osdeploy_dfd, OstreeDeployment *deployment
   return glnx_opendirat (base_dfd, base_path, TRUE, ret_fd, error);
 }
 
-#ifdef HAVE_SELINUX
 static void
 child_setup_fchdir (gpointer data)
 {
@@ -3245,6 +3244,7 @@ _ostree_sysroot_run_in_deployment (int deployment_dfd, const char *const *bwrap_
                        (gpointer)(uintptr_t)deployment_dfd, stdout, NULL, exit_status, error);
 }
 
+#ifdef HAVE_SELINUX
 /*
  * Run semodule to check if the module content changed after merging /etc
  * and rebuild the policy if needed.